ZEPPELIN-1319 Use absolute path for ssl truststore and keystore when available #1319
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
Good catch, LGTM! CI failure looks unrelated. |
| getConfDir(), | ||
| getString(ConfVars.ZEPPELIN_SSL_KEYSTORE_PATH))); | ||
| String path = getString(ConfVars.ZEPPELIN_SSL_KEYSTORE_PATH); | ||
| if (path != null && path.startsWith("/")) { |
Member
There was a problem hiding this comment.
does it need to consider Windows?
Member
Author
There was a problem hiding this comment.
@felixcheung check for windows path is handled in getRelativeDir
Member
There was a problem hiding this comment.
hmm, if path == C:\zeppelin\conf\ssh
isn't this turning it into a broken path like c:\zeppelin\conf/c:\zeppelin\conf\ssh?
getRelativeDir(
String.format("%s/%s",
getConfDir(),
getString(path)));
Contributor
|
@prabhjyotsingh Should we merge this? |
Contributor
|
@corneadoug Yes, sure. Will merge this soon if no more discussion. |
asfgit
pushed a commit
that referenced
this pull request
Sep 2, 2016
…available ### What is this PR for? Use absolute path for ssl truststore and keystore when available ### What type of PR is it? Improvement ### Todos * [ ] - Task ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1319 ### How should this be tested? Config `zeppelin.ssl.truststore.path`, `zeppelin.ssl.keystore.path` and verify whether the absolute path or the path relative to conf is used. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? n/a * Is there breaking changes for older versions? n/a * Does this needs documentation? n/a Author: Renjith Kamath <[email protected]> Closes #1319 from r-kamath/ZEPPELIN-1319 and squashes the following commits: 5587d5a [Renjith Kamath] ZEPPELIN-1319 add check for Windows path fc2ac9f [Renjith Kamath] ZEPPELIN-1319 Use absolute path for ssl truststore and keystore when available (cherry picked from commit 922364f) Signed-off-by: Prabhjyot Singh <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this PR for?
Use absolute path for ssl truststore and keystore when available
What type of PR is it?
Improvement
Todos
What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1319
How should this be tested?
Config
zeppelin.ssl.truststore.path,zeppelin.ssl.keystore.pathand verify whether the absolute path or the path relative to conf is used.Screenshots (if appropriate)
Questions: